Adding back in the listener support...
Merge branch 'phoenixSupport'