Modify implementation to use EJBs