Add start and stop features