Improved import/depend stuff