refactor of dataModel .. add Account as topLevel model