Adding better injection support