Further work making start and stop pluggable