Worked on the user class