Updated JSON support for namespace changes