Bringing import into the most up-to-date code base