improved and renamed jndi classes