Refactored user handling + user/account APIs