Update to use scp2 high level API