Moved account details to model