Changed setters for @Autowired