full refactoring atlas storage