Add missing kinds for the new API (#3757)