Batch job now includes all flows to ensure the correct order