Removed a few references to Type
New work added