refs #151 - Modify templates to use the new specific classes