Added template support for subject