fixed brokens specs. Encapsulated listeners registry