Updates to reflect changes in spi