ProtoModel enhancements