I thought we wanted to move away from Accessors in favour of SPI classes - is that possible here?