Adaptations to Account model
Improved methods of account model