Improve adapters loading