XML now supports indices for array elements
Clean-up XML: index not needed anymore