Additions for Settings management