Logging moved to a separate module