Added optional extended context feature