added proper import check