Template optimisations
Implementing Push for History