Update code to work with Sprint 37 Preferences