Remove global elements/replace with types
Fix: pattern for service event and response types