Updated for History management