Feature/add diagnostics output