ExecutionContext added
ModuleFacade partial-bug fix