Planned MirrorManager changes