Added BatchBuilder