Add required @type properties
Updates #29512