Update for API changes

Also, let's have engine-specific logs