Parameterized the classes used in the service definition and updated the compiler pass accordingly.