Updates for new datashape grammar