refactoring store andrelations services