Updates to User OOP structure