Add more extensive logging