Updated the adapters
licensed under APL 2.0