Added remaining functionality to User