artifact store refactoring