added get from remote feature, small refactoring