Refactoring storage and base