Construct 2 Templates

Updated C2 Templates