FIXED #38. Ability to use uri keyword to remove ambiguity.