Use logger and fix macro/enum collision from spire
Improve module logging