Refactor settings so that clients don't need to know the structure of the data