Add history control stuff