CHANGE: Refactoring for the media:import task