Added Autowire support