This is copy paste, Fix the logger to appropriate class