Compatibility w/dbarts master