Update for new idioms