Changes on workflow management classes