Added user preference support