New import and code refinements