DefaultEntityBuilder - now cleans up string data types to match the entity metadata types.  UUIDs are fixed.