remove withOriginalType; use Typles builder more