Add batch support
Remove non-functional array type checking