Remove need for null fields, parse all attribs, use iso date