And include new templates