Adapter pattern added.