Improving namespace resolution