Add support for interruptible