Feature/task simplification