Added support for files with same fieldname