Added timeout
Improved reporting