Added support for some common primitive types
Added more primitive types
Cleanup and another primitive type added