Added subscribe/unsubscribe functionality