Update to support mmb refactors