MST task refactor