Add spm support