Add onStart and onComplete callbacks