Removed xml to array junk, added more fields.