Refactor batch fetch module