Added few more template tags