Added support for Json/Bson objects