Updated the settings object to be more inline with standard practice