Started integrating a preference layer