* Major CBI improvements