Converted more attributes to use FHIR datatypes