More shared adapter language changes.