Fix for schema mappings changes

34463ffc84348e52dcb3b1525ef4efbbc075367c