Add interrupt option & onStop callback