Improve/model of account

Change relationships.