Further changes and expansions for new diagnistic