Changes to use the PersistentCueListener in separate namespace.