Added more methods to User