Added further templates