More refactoring and adding store requests.