Updates to support Business data's metadata