Build Manifest correctly