latest changes
Switched to JNDI Lookups