Added: base on spm@3.x