PreStart and PreStop added