Add extra diagnostic tasks in