Updated code for the Uri Matcher