History support, some optimizations