EventDispactcher design changes