Replaced @Data with @Bean(data=true)