Started adding support for file_locations