JNDI changes