massiv refactoring of context objects