Adding diagostic abilities.