Refactoring and remote store creation