some tiny refactoring use existing record store, do not create a new one.