Added support for user class