Added namespace to the event listeners