Adjust importer to the new embedded model

I fixed the problems from which I had to revert earlier. It works now.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>