Refactored TypeMap and CollectionTypeSet.
Refactored validation hiearchy in prep for extending to collection validation.