Adapter pattern added, closes #7