Refactor assets import