update Adapter with latest API changes

And fix incomplete data in pull-request