Extend CBI state handling