Added default OnExit method