Code refactoring, new storage providers