Reworked adding-mechanism to include member-type!