EJB Samples Changes