Added Adapter, Cleanup