Converting more EJB to POJO