Update for 3.8+ UI