Improve module logging