Updated history to use linked table