EMVC-30 Utilizing the Uri class through out the core