Add support for base event subscription