Code and mapping changes for new schema

Need applied after: https://github.com/openmicroscopy/bioformats/pull/499