Added several logging points in context