Added more user functionality