Fixed load from file methods / changed file system