Major refactoring of intermediary result handlers to condition evaluation listener