Update to declare @Bean definitions for device resolver