Refactor to use new logModule