Added EventHandler and fixed map list