Added initial support for Schema dictionary for TypeId