Add START & STOP handlers