Added lazy loading and graphics manager