Resolved some bugs and added support for user