Refine Component injection a bit