Improve basic types
Improve parameterized type