Attempt to add support for multiple adapters