Redefinition of objects
Added event functions