Starting to add sort support