Migrated settings to a more flexible format