Added support for named csv/json files