Converting even more EJBs to POJOs