Upgrade to new union type syntax