Improve Engine manifest