Step 2 metadata conversion

Step 2 metadata conversion