Massive improvements and listeners

Jira: WP-1117