Update for new BMFS tool