Add missing files
Resolve metadata issues