Logging support and DI added