Merged service and plugin