Added diagnostic packages