Updated GF batch connector helper classes