Added Diagnostics