Added support for SPC