Add Diagnostics runtime option