Modified not to use import property