WP-2572 Updated the importer