partial refactor store registry