Refactor for Tasks to Task and Tasklists to Tasklist for models
Changed tables for Models