replaced event manager

fixed, typedefs not so beautiful