Added forgotten RichContext