Accidentally reverted some connection interfaces