Improved the task so it is less tightly coupled to Hippo specific needs