Improve SPI logic for portions and subdivisions