Added template manager