Add capturing of stdout, stderr