Adding more debug logs