Added TaskModel, updated other models