Updated for compatibility with SC 1.10.0 (work in progress)