Updated for history callbacks