Added complete set of basic types