types changed to file and resource