Listener's profile serious refactoring