Added template content in returned template
Added uptodate function to result tuple