updated and inserted some interfaces & cleaned up importer code