Add acid-state support