Further import improvements