Add support for unsubscriptions