Fixed BaseType references
Removed unused System.Composition using statements