Adapter code for release 2.0.0