Adapters changes