listeners and massive improvements
Jira: HUBWMC-29