Enhance Event handle system.