Add state information to Domain service
Use the new changes in the domain service

This removes the duplication of data from the controller to the service