Initial conversion from EJB to CDI services