Modifications for Core's EventManager