Added class to extract the expression part of a template command from a template