Json empty map support added