Added JNDI singleton to allow use of JNDI properties