Some optimization in manifest