Change ServiceConfiguration to be a non dependant object.