Changed templates inclusion to allow easier override