Add support for more basic types