Switch to using block based notification subscription