Updated lazy loader