added EJB TODOs