Add TK and updated EventManager