Updated adaptor