Fixed problems with import