Added remaining template