MC-44: Poc/apiimport2.0

Yes, to add in the ORM mapping.