Added asserts for CBFS values that should be non-NULL
Replaced const unique_ptr& with raw pointer