Added a wrapper for diagnostic setup