Update for multiple output format in 0.4.6+