Added logging context