Updated more generic basic template