Switch to CDI annotations