Updated the generic template