Modify task classes