Added template solver