WIP on Adapter improvements...
Bump version