Re-formatted bean auto-wiring