worker import: re-define entity; improve import code;