Changed Shim API
Fixed conflict