Made the account model smarter