Final changes in EventManager