Changed to use NodeDomain event structure (still broken)