Add support for builtin Unit, Boolean