Changes for XBEL persistence