Modifying the schema and the context code