Add using_custom_directory check to get_datafiles