Refactor and fix of external results utility classes (continued)