A lot of discussion in the HBOM working group about different types of roles an entity may play, and which need to be captured in an HBOM.
Based on these discussions, the idea is to replace the dedicated "manufacturer", "supplier" and similar properties that take on a role, with a generic "entities" property which supports both organizationalEntity and organizationalContact along with a "role" property.
Much like the lifecycles objects, you can use the enums or can define your own.