More MainDriver changes