Enhanced tasks definition