Move to variable template extension