Major update of logging format