Added two extra templates