Adding partition_by