removed optional execution context parameter from calls and some other minor refactoring