Refactoring request storage.