Handle extensions properly
Fix metadata