Move from autowired to resource annotations