added event dispatcher support