Added util class and changed logging