Refactor add task to reduce coupling
Merge remote-tracking branch 'origin/create_logic'