Changes for Debug logging