Added preliminary default adepter machinery