SFM: Work on high-level bundle tool