Refactored preferences