Change logger to Xlogger and add logs