Added controller reference to Diagnostics