Update with latest Pro changes