Refactored User and Account classes