Fix model & loader so that any csv model can be loaded