SPI auto engine modifications