Updates to User and Account Classes