Added Null SCM support