Updated to use kbwf_common