Added better TypeDefinition on handling base types.