Update to use new subscribe option