Make the basic template more basic