Working on fixing Domain Model.