Fixing import functionality