Added support for Maps, Map Arrays, Nulls and Bools