[Improved] Better logging in all modules