Fixed performance issues in DicitonaryListener