Refactor to batch-wise requesting