Add loader and models optimisation