Update existing import logic

[jomey]

Update the existing import logic to accomodate the improved schema

[Ibrahim-Ola]

• Get familiar with the import logic.
• Think about things that must change when we change the current structure.