Beginning with Adapter api
More improvements