More work on modeling spi classes