Minor changes to remove dependency on ModelList