URI & PersistentMap improvements