Move $gt/$gte/$lte to the new model