Added more classes to bm