Add ShBFM and ShBFA