Add loading system (need test with GUI)