Support for consolidated imports as well