Added support for all simple types