refactored code to use URI to types instead of full qualified class names.
refactored code to use URI to types instead of full qualified class names, part 2