Updating the Import functionality to match the new exports.