added some work for bmo modules