More intelligent adding of batch locations