Adding support for multi-way split