More structures work from hl7