Added handling of aborted state