Changes from LogModule