Debug messages enhancement again