Add logging for CLI environment