Updated UserAccount domain (commented out compile errors --> TODO).