Added ability to specify a different user class