Added tasks
+ Refactor