Add `delete`, `load`; some refactoring