Improved typing
Primitive handling