Refactored remote service
Refactored remote service