Added more stuff to User