Added plan history handler
Merging