[WRDR-33] Better logging