Add Start and End callbacks