Few more minor updates to JsonMapObject provider