ToxDoService improvements