Modified import headers and argindex