Some adapters changes