need to expose more of this to MML