More work on JNDI binding layer