Improved manifest