Internally refactoring remote v2 service to support batching requests