Optimizing and expanding manifest options.