[FIX] improving manifests