Added importing and updated node checking