[#110974] Changes to add autogenerated classes