added EJB's support