Added logging utils
Minor changes