Fix adapter to support changed interface