Added preference data
Add missing major type defs