MMP: General performance improvements