Added support for user preferences