Small changes to support the refactoring on the engine side
Merge pull request #18 from gem/taskmanager

Small changes to support the refactoring on the engine side