Added lazy loader
Resolved conflicts