beefed up the config/dependency injection