Use new partial function instead of template