Refactor account types