Refactoring to handle tasks hierarchies
Comment change