Updated wrappers and generated classes to the new clipping structure.