Add support for separate ranks between handi and not handi