Add start and stop support