Refactoring the csv annotations to use SPI