Added ability to set user