fixed attributeArray and entityArray