Modified the schema for Preferences etc