URI & PersistenMap improvements