Updated adaptor to use logging