Added most of the account model