Added persistent dictionary
Improved templates