added version and few template changes