Initial changes to CBF namespace