Added User Preferences and Activity classes