@rajas okay, thanks! Perfect info on the coming support (although the link is broken it should be 9699 I believe in the path).
I hadn’t run into this issue directly since I hadn’t actually been testing/integrating the schema on those Types at that point.
I’m marking your comment as the solution so that anyone else who runs into this issue in the next 2-4 weeks can reference the same resources.