Updated due to new event subscription policy