Extend CBI Delegators, fix some CBI issue