Added template and client template