Event manager improvements