Add support for oneshot services