Adding diagnostic command