Again added underscore library on templates where needed