WSOTWO-142: Fixed problem with loaders and slowly importing files