Added support for piplug services