Further enhancement of history interface.

Change-Id: I33e260ff2d440de5cb66fa5f1707c273e658c025