Moved to JNDI for the database