Adding subscribeOnce support