Including support for JSON properties and new update entity metadata call