ping @superdweebie do you think this is acceptable? Looks ok to me if the odm module defines the same stuff later on...