Add support for abort