Converted beans to CDI