Changes made to allow arrays and attributes inside arrays