Added unsubscribe and subscribe options