Updated task model