Update DemoContext and ContentContext