Added Uri and Helper classes. Tweaked URI assigned to discriminators.