Add more basic types