Improve the Genius Listeners Framework