Code refactoring, Loader and Saver are now static