Add support for multiple adapters