refactoring store and relations services