Updated the template and made it more generic
minor update