Added support of warnings and errors capture. Change generation to reflect that