Restructured account types, needs testing