refactoring of operator infrastructure - part 2