New implementation for custom Events