Updated for newer classes on batch framework