Added DI
Add additional config options