refactor store registry