-Refactoring Listener, so that it became template, making it easier to add Listener types <br> -Added decorator pattern for Charcater in order to be able to add responsability dynamically