Speed up loading
Fix after refactor