Changes to deal with new files