Updated for combustion 0.4.0