Added adapters
Merge branch 'local'