CAROLINE-49: Refactor to new preferences.