Fixed file loader and changed file schema.