Update for new utm and utm_local frames