Switch over to new preference system