Add support for onStop