Moved ContextStack to part of API and changed ExecutionContext interface to use it instead of generic Map