Updated models to accomodate legends

[#74049456][#73967720][#74319814][#74536668]