Added history implementation