Better handling of driver type and add leading / to jndi name