Better handling of results file loading