Initial implementation of exec diagnostic wrapper