Added more User functionality