Improved account model and specs.