Added history expansion