Used lazy injection to reduce initial memory overhead

Used lazy injection to reduce initial memory overhead #326