Update to the way subscribes are handled