Updated to work with scms v2