Add adapter support