Improved entity import semantics