Changes to work with one account type