New Adapter

Other Improvements

Backwards Compatibility