Added handling of unsubscribe