Dev/generic adapters