Made preferences safer