[Mason] Finished up SPMO