Refactored to use a Property File & JNDI