Improved partial handling. Set templates directly (without capture)