Make slight changes into log system classes composition