Added additional config
Restructure for lazy load