Modified calls to new @Autowired setters