Constructor injection enhancements