Switch to DI container usage for property injection