Port to new version of databundles