Refactoring after Redis