Minor changes in context files due to code refactoring