Moved account into model