Added OnStart callback