Update VC logic to handle custom notifications