added service_plugin router and some cleanup in the same class