Changed to class-based Preferences