Adding built-in method events support