Moved dumper states/functions to upper level