Minor update to uri mapper class