Improve manifest