Contextlog implementation

Fixed.