Added forgotten RichContext
Added forgotten RichContext