Added dom event management