Removed SPI
Added Facet and ui