Updated the how settings are handled and processed