added the extension file
merge conflict
Merge branch 'dev'
fixed the lazy loader