Move to supervisor-cells architecture