Modifed the model to support custom User models