Move to type-str