Added Guid parameter to Types

Need a unique parameter for each type so that
each definition produced a unique type.