Updated for GDK Preview and XE 16