Injecting after the parsing is not needed here. Sorry for the messy commits!