Added set files and changed field names