Added diagnostic task