task model refactoring
merge