Enhanced adapters support