Bring loader/dumper inline with session expectations