lazyload added

Change-Id: I3fa562be80f732b7681f0a707832884975490195