Refactor SOAPdriver and CKM accessor