SCHEMA-107. Fix for hidden entity ID constructors