Improve history design