Fixed xml bug
Added first event implementation