Refactored. Added in-memory adapter.
Merge remote-tracking branch 'origin/master'