Switched from @Autowire to CDI @Inject