Update more calls in adaptor