add CBO and CSQL