Improve the Type type and add helper