More work for JNDI Zen