Changes for JNDI Datasource