Now grouped by file name, with object type