Load Classes when Needed
Merge branch 'lazy-load'
Save Options in Array
Merge branch 'save-options-in-array'