Add basic type support