Some changes (JNDI)