Add support for base types