[FIX LAST MERGE] Refactor assets import