Simpler injection logic and dependencies