Added onStart and onStop callbacks