Updated context, renamed logger