Updated Start and Stop action hooks