Updated naming conventions and added ways of getting user data