Add in support for integrating StatefulController with Domain Entities
Slight cleanup