Updated basic template