Include context information in zen mode (issue #375)