Data management (export) + regularTransaction handling changed