Add more verbose messages