improve classes manipulation methods
create EventHandler instead of EventHelper