moved soap context addition to preprocessor