ToxDoService improved