Further template modifications