Adding self.SERVICE_OPTS to new API calls