Refactor for the FastEventManager