Fixing import methods