Move field injection into @Configuration