added support for adapters