Add unsubscribe logic