adding more support for Event subscriptions