Added support for remaining simple types, as well as placeholders for to-be-supported complex types