Add support for bm