Add resolution namespace protection