Refactored autowiring