Add ability to subscribe and unsubscribe