Revise Task Controller and Model