(logger) Update logger and do corresponding changes in code