Support additional service actions

This is #125 rebased on top of the latest master