Refactored task and moved roles to the Goal model