Improve manifest configuration