Add ir and uv management