Change the architecture of Listeners