Adding jndi support