CAROLINE-49: Refactor to new preferences.
Merge pull request #135 from it-workshop/wp/CAROLINE-49/2

CAROLINE-49: Refactor to new preferences.