Update CalculateDeltaQ module to handle multiple GroupID