Added Adapter Pattern