Update services and interfaces to not use concrete objects to be more extensible.