updated account management classes & enums