Added support to pointers and map of complex types (pointer, structs)