Add more diagnostic messages