Added tracking of import directories