Updated for batch build