but CBA is still required, maybe add CBA commons?