Improve UV management