More restructuring to support various cluster models