added rebalance support