Update for new datashape grammar