Bug fix
Import action refactored