Adding default dir and add few trace line
Remove warning
merge