Changes for correct attachment of adapters