Change some injections to provide by annotations