Add back ordinal support